From 85a8828e23be4c8f20d3b57e5ae246ead9bd6b44 Mon Sep 17 00:00:00 2001
From: Rob Browning <rlb@defaultvalue.org>
Date: Wed, 4 Jul 2007 23:38:04 -0700
Subject: [PATCH] If allowed, create and remove
 /usr/local/share/emacs/site-lisp.

---
 debian/changelog                |  5 ++++-
 debian/emacsVER-common.postinst | 12 ++++++++++++
 debian/emacsVER-common.prerm    |  8 ++++++--
 3 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c3e2301e2fc..81a9cb4340b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,11 @@ emacs22 (22.1+1-1) unstable; urgency=low
 
   * Change build dependency from libpng3-dev to libpng12-dev.
     (closes: #424622) [rlb]
+
+  * If allowed, create and remove non-flavor-specific
+    /usr/local/share/emacs/site-lisp.
   
- -- Rob Browning <rlb@defaultvalue.org>  Wed, 04 Jul 2007 23:32:47 -0700
+ -- Rob Browning <rlb@defaultvalue.org>  Wed, 04 Jul 2007 23:36:10 -0700
 
 emacs22 (22.0.99+1-1) experimental; urgency=low
 
diff --git a/debian/emacsVER-common.postinst b/debian/emacsVER-common.postinst
index f4c5d654788..59c90d0b7ff 100644
--- a/debian/emacsVER-common.postinst
+++ b/debian/emacsVER-common.postinst
@@ -14,6 +14,18 @@ done
 
 # Create the site-lisp dir for this flavor if we're allowed
 
+parentdir=/usr/local/share/emacs
+newdir=site-lisp
+
+if [ -d ${parentdir} ]
+then
+  if mkdir ${parentdir}/${newdir} 2>/dev/null
+  then
+    chown root:staff ${parentdir}/${newdir}
+    chmod 2775 ${parentdir}/${newdir}
+  fi
+fi
+
 parentdir=/usr/local/share/emacs
 newdir=${FULL}
 
diff --git a/debian/emacsVER-common.prerm b/debian/emacsVER-common.prerm
index b1aefd4364e..33df9350727 100644
--- a/debian/emacsVER-common.prerm
+++ b/debian/emacsVER-common.prerm
@@ -15,7 +15,11 @@ done
 
 # emacsen-common/emacs-remove used to be here.
 
-(rmdir /usr/local/share/emacs/${FULL}/site-lisp 2>/dev/null && \
- rmdir /usr/local/share/emacs/${FULL}           2>/dev/null) || true
+set +e
+# Only remove these directories if they're empty.
+rmdir /usr/local/share/emacs/${FULL}/site-lisp 2>/dev/null
+rmdir /usr/local/share/emacs/${FULL} 2>/dev/null
+rmdir /usr/local/share/emacs/site-lisp 2>/dev/null
+set -e
 
 #DEBHELPER#
-- 
2.30.2